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