[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 76611169d1 am: d384a571e0 -s ours am: d7c4cd00a5

Change-Id: Ibb6514661627c245c363024030d2ba5f816d652e