Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 3ebb0957ae am: da6def9880

Change-Id: I84793411bc7fdd06cf6d429cf7a554530a085a18