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

am skip reason: Change-Id Ia1c6695883c59ee504315988793b9b3c34e9221a with SHA-1 caeefb9009 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17f2b2ea6b3f9134a8692aa1295c031036798c85