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

am skip reason: Change-Id I2abeb0fc28b199f2ca8d678cd5641918567926fe with SHA-1 21479602c3 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0601a04eb5e6018763616815261c6893977ecc10