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

am skip reason: Change-Id I0d8d9a89cfbef7db13fd296156009b1a4d3f58f6 with SHA-1 68fa964a3d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0333a745778217a1c81605d25a4007e8452881b6