am 651db9b8: am 504c5d9c: am a883fe8d: merge in klp-release (no-op)

* commit '651db9b8cc7d71e0c150e103cc97db900e226808':