Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: I2694d97892260c549e016c2c2255bbc6d35d74c6