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

am skip reason: Change-Id I7e133b2a441f794d1a03f6f626d5acc684f10944 with SHA-1 c4c7805b0a is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ecbccc5818b4affbaf0f4f457ad2ba25b2466b8