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

am skip reason: Change-Id I63b28cc560d8903c14110cfa03e8695fe58f5180 with SHA-1 9a570072bf is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66fb7af265e487b2c0d6c5c7acc9c0a7de324341