merge in lmp-mr1-nova-release history after reset to lmp-mr1-dev
The Android Automerger authored
119cfb1c