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

am skip reason: Change-Id I61ee2b53635aa76b4f47225eb33db0b6b1cdf6ae with SHA-1 f6bd816d3b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc99b2d36b947fd382409b279c48c81069231f64