[automerger skipped] Mark ab/7061308 as merged in stage. am: 23682675c2 -s ours am: 60ff0cc4f5 -s ours

am skip reason: Change-Id I16af5a75f149e12e724ae9ec5839b26716cf1be0 with SHA-1 c419771500 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I743adde827e53a32a9b31bf52515e867259888e7