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

am skip reason: Change-Id I1092ffb640be447b822f2b4de4e0ee4eabd618db with SHA-1 779177261e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a06e26aea3a0f28c1b767d432efc029e454f889