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

am skip reason: Change-Id I299cdaf6b78f6beece07fcc83b8c7fb57e0f6d0c with SHA-1 d449d80e36 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffa1ecc9c4ecd0cfe6e1a20b65cac7447c13ce5f