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

am skip reason: Change-Id If3911be0b4ebb872b1c0630013afc7627b484548 with SHA-1 35f4807790 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06d86f911605a87c268240c62d12008383527a05