merge in lmp-mr1-release history after reset to eb7bb208
The Android Automerger authored
9dd32dc4