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

Change-Id: Ib5fba8eeff4d96d5c3ded0f770feac9f1f5a50d1