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

am skip reason: Change-Id I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 with SHA-1 f080cbbb54 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62f5bf5a1ff5597048775878cdc3086fb9e9e1a2