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

am skip reason: Change-Id I921f2e386c79d3d97715a2fe08838f9e8593f4f8 with SHA-1 6383912c33 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29812ac27a5152d100179ff21bd15c208bab4cb7