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