[automerger skipped] Mark ab/7061308 as merged in stage. am: 6a70ae05ca -s ours am: 00a40a9086 -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: I78eab8771c73701e081fc1ea0567ad3c1ed0fd05