am 536dea9d: am 169c12b5: merge in klp-release (no-op)

* commit '536dea9d61a032e64bbe584a97463c6638ead009':