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