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

am skip reason: Change-Id I6657e1cdcb836d87fc62f92d0f8705dad94fb510 with SHA-1 71aaa15262 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c368f0980379c84bc4f0a4ee83106954e145618