[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 5eb772bfa5 am: cf2ac5d958 -s ours am: 857509b840 am: 49650663ae am: 84c3eb4ce5 -s ours
am skip reason: subject contains skip directive

Change-Id: I67851e9f2e2cfbe935b314584d8f812bb044bdf4