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

* commit '504c5d9c6e05cecabcb2404a2fd1a05259602858':