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

Change-Id: I44741639fe038065394db6c117f8df85e1cacbf2