[automerger skipped] Mark ab/7061308 as merged in stage. am: b6847a666f -s ours am: 2a35208d05 -s ours

am skip reason: Change-Id Id49bd915bf088e2eaa1dc889800615fa3722026b with SHA-1 6d95c14fc5 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79cdf679b5d350c9cd571edb1266af1993a97d46