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

* commit 'b794b9a72dae95696df3dd7770a85d45d2e48651':