[automerger skipped] Mark ab/7061308 as merged in stage. am: 11ad286ca5 -s ours am: 7b1b9fc64d -s ours

am skip reason: Change-Id I7be3538b5367af6e4a049f469fd46bba23e12dd9 with SHA-1 70c3769fc1 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e5f3d6ad12e7f384e825b46c02c20567117d854