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

am skip reason: Change-Id I04f7a390d88c207d4441f089d26b1a77a2926381 with SHA-1 b875317365 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44df927f959f75826e95ed74148c32205030b825