am a370c0f7: am 3966c571: merge in klp-release (no-op)

* commit 'a370c0f7fe65d6f012902342249d3a84b474f277':