am 8f870c5d: am f28c9d5b: merge in klp-release (no-op)

* commit '8f870c5d934bbc848e0daf3138ec3347ba5a635c':