[automerger skipped] Mark ab/7061308 as merged in stage. am: 26085d7643 -s ours am: 8949b78899 -s ours

am skip reason: Change-Id I0b1dcc35aaaddc8ced4ae480986c244ec91cab10 with SHA-1 fc21a11ab7 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5512d7b14567d993c570b1b9d0f670cadebfe4e3