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

am skip reason: Change-Id Ibf2acce9bb4ac7e29144510e546415f4cf9c54d7 with SHA-1 988c89166f is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9c20960f2f9c4e0929aa6dc9fb59603b060b335