[automerger skipped] Mark ab/7061308 as merged in stage. am: 6415a1778f -s ours am: 4bb28a6d24 -s ours

am skip reason: Change-Id I76412ba138e6788c9a077d0bcc1aee915a38dc59 with SHA-1 ea98f5782e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I314c683e8d2df07447fd6ccce5e23a4398e4310c