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