[automerger skipped] Mark ab/7061308 as merged in stage. am: 9ddec31372 -s ours am: 7f3a8e1008 -s ours

am skip reason: Change-Id I7b5221cdeba02ad8056e811eb9a22f86cde38915 with SHA-1 48468fa946 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3fae8261a31d5eb0612116294e07b724ed796d3