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

am skip reason: Change-Id I01991052448abf12ed16688792cb9a02a3156e90 with SHA-1 9dcbc59ba6 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icffae1ddd4218f3edbd33cb0e64d1cb9236cf8cd