[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 42ac06e560 am: 52d940cabb -s ours am: 837b059e52 am: a8c15d883d am: 93346b5016 -s ours
am skip reason: subject contains skip directive

Change-Id: Ife241ee5120f1d08174d4cc05bc75360438a154f