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

am skip reason: Change-Id If9d185ca2200eddf522f61e8db4054b6a2dfb332 with SHA-1 dec97f04ca is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8ac5006d2b977a76af12e849e85de5ead8044af