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

am skip reason: Change-Id I12e087263e2a157458fe5246fbb595fcf0cfc369 with SHA-1 909f9a4473 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae087b610380c3dc4ce7ae87f74b9a882600addd