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

* commit '479397047075e236af9b23848371aa302d95c213':