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

am skip reason: Change-Id Iad8fbed57bb3fc6a2586a8fe5b2ebd99f6d69ff1 with SHA-1 890dd68963 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53d712a65c29199e68cd1fe3d50e1ff340ac9479