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

am skip reason: Change-Id I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f with SHA-1 a4c9705ad2 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic924b86facbce84cfb9f97b80ce8ce33ec6ddef8