Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4830ff59e0 am: 073c574496

Change-Id: Ia8808b8dfabcaf7f312189e7d13bb00163b73026