[automerger skipped] Mark ab/7061308 as merged in stage. am: 3ba9f2e739 -s ours

am skip reason: Change-Id Ibd77c56ba5d1b395d478ba85263596032fa22144 with SHA-1 c6b7a9171d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9916418f3777694e7e4db2c23f1d00e5840541c