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

am skip reason: Change-Id I09415f0842e511509490afd702b688be4c33d266 with SHA-1 1c858da4ae is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc701a21efa6c85a659273e97a0057d530871198