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