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

am skip reason: Change-Id Idff15bd132a90619c4b88d45d64dd69100d752b7 with SHA-1 fb04f74458 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieba24abe80dd69aeefbc554e4a10c30176d221e6