[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 5eb772bfa5 am: cf2ac5d958 -s ours am: 857509b840 am: 49650663ae

Change-Id: I4cbf4e3358a2b2f117c7dd48ef6275983ef08f9e