[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 83fce3a3c6 am: 3f24674199 -s ours am: 57e9686fe1 am: 64c33602bc

Change-Id: Ia199290391eedb68b6f2aabfae1b5965fc73f014