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

Change-Id: I65bf037aec8af321beb5d4ad3617fc59d03efd96