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

am skip reason: Change-Id Ia3ec4682c4b6574dd45893ae6502a7057a503c09 with SHA-1 0f25dc4aea is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2584bc0345e749088841230eb768ca6a70ea5492