[automerger skipped] Mark ab/7061308 as merged in stage. am: 7ceaba3d04 -s ours am: 6be3d7a238 -s ours

am skip reason: Change-Id I9155d0b800bf9420d933c2787c0fb7522afb8904 with SHA-1 b960b59dd1 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9babc9825ee117493f7a8096750d5205ffc86503