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

am skip reason: Change-Id I79a32e1e7e4ec81b98fe196909ebb7b1ea307c0c with SHA-1 fe82a47e60 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6017c92170936154e78251c692f69e6a703751a7