am 8eccbd3b: am edb74965: merge in klp-release (no-op)

* commit '8eccbd3b5d90b9f0557c9a01f49d45e98ac85a46':