merge in klp-mr2-release history after reset to klp-dev
The Android Automerger authored
8b580684