Merge in history after reset to stage-aosp-mnc-mr1-release@bc445d763fe265ee2757fdc2b3cdd5719429d9e5