am 587fa0b4: am 565caebc: merge in klp-release (no-op)

* commit '587fa0b43e4ccb2479003f54364ff75b7eab7c11':