merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger authored
1dff62f8