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

am skip reason: Change-Id I7dbd8f208598e86e240ca46560f473f886efbbb2 with SHA-1 556d03ac6e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac3c377ab33e5c43bcd91df9b5a72db6908cd5c5