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

am skip reason: Change-Id I3b7b35ce962378c5d7ae0776922b1a36cdad1d67 with SHA-1 4705e1173e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8fd0fc7daadd2516595411268bcfab05cd6666de