merge in lmp-release history after reset to cb7a3605
The Android Automerger authored
d5512c28