Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4edad3bb73

Change-Id: I744674e0cd4420ae8cd48b3620dc67bd68b03ea0