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