[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 05994afb60 am: 02ec86fe41 -s ours
am skip reason: subject contains skip directive

Change-Id: Icd4d5829dc287e3e8d1eab53113187120e0b980b