merge in klp-release history after reset to klp-dev
The Android Automerger authored
6aa6f474