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

Change-Id: I5c48933fa38245a560d924b9c0c18a12b6cd04b6