merge in lmp-mr1-release history after reset to 6fa06b78
The Android Automerger authored
c04a5338