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

am skip reason: Change-Id I6f608a8bc3cf979bf340cb6ba745eeeb8f02211b with SHA-1 7b493675c6 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b71d0e7b98be5e05018c413de9e4648a38037fb