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

Change-Id: I294487be872b5007c949d2f2b1feaa7e6d243ac3