merge in mnc-dr-release history after reset to mnc-dr-dev
The Android Automerger authored
ac1c3a4c