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

Change-Id: I352ed2cba25df69594ee5861f3a64be63bc18c96