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

am skip reason: Change-Id I417c8ee2fb2ff8d09b212071306c40305a12fbff with SHA-1 03629d722f is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa2615e2a1d0361f6166c519b32a98c60a7c2f7b