[automerger skipped] Mark ab/7061308 as merged in stage. am: 56a2d43793 -s ours am: 497bf7506d -s ours

am skip reason: Change-Id I501d45a4de21449596e397d97d72a5c54ffb27d6 with SHA-1 937a1db317 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5913a95be846f536f11a731acde3ad990028d76d