am 8293f74d: am b794b9a7: am 56cbb587: merge in klp-release (no-op)

* commit '8293f74d1232775b9f94b5a2381bfefe856d0ba5':