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

Change-Id: Ie467bcae250491db2c693242851c38696585132e