Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: ff39d325a6 am: 7e558976d7

Change-Id: I37138ff4fd908e04ecaf1f4097fef21aab28a653