Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 558c496c8f

Change-Id: Icb80f60b1d99db48ac5295dea5fb3a52d183be6d