[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 05994afb60 am: 02ec86fe41 -s ours am: c32f1fcbad

Change-Id: Ia1351eef5f6899ca0b0d68e2c7a3e1e79987966b