am 428c861a: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master

* commit '428c861a8e8aed4aa3224bd8d18211c9e6ca1c64':