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

am skip reason: Change-Id I5dd4c525acc86ecf09d9367bf03d3fcd3ad7f217 with SHA-1 c2c4f842ea is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebf7f0b9a3c7c0c097517f0f3554b4677903eff7