am 66b5a6fc: am f717b620: am f65b3dfb: merge in klp-release (no-op)

* commit '66b5a6fca7042c991536feacaadbc7ded60b1917':