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