am a9266df5: am 4d9c9bd5: merge in klp-release (no-op)

* commit 'a9266df57798d1f8f27ab4ab0cde098d1de801c4':