Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 5eb772bfa5 am: cf2ac5d958

Change-Id: I1ffdeec840304f8deecada3d41c8e5a648849b80