[automerger skipped] Mark ab/7061308 as merged in stage. am: 25b6e21c78 -s ours am: f9adfd4e3f -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: I4d3d60fb47944b0aaba502b941a1f85060805b55