[automerger skipped] Mark ab/7061308 as merged in stage. am: 6882553d74 -s ours am: 2ca5d8a437 -s ours

am skip reason: Change-Id I20595bd3406ce31f03d3c0cddc8bb95e7ca9c4f9 with SHA-1 7ed5a4dc8f is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2438eecbabc87e07ab1a709fe4d7ff160d27ba79