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

am skip reason: Change-Id Idd7ee8d803d1d0a08de8c1b1616ec9d69c6817ce with SHA-1 2e31d97991 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01c79eaffddb0515f9734eab4da1209014b536de