Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 1332d8b985 am: 9a510ee7ab

Change-Id: Ibe97a285c71c46c2df6e13eadc8acc17c98f979d