merge in lmp-mr1-release history after reset to d10a49ad
The Android Automerger authored
95e1d1c7