[automerger skipped] Mark ab/7061308 as merged in stage. am: bf08f8656c -s ours am: 8b446e09b7 -s ours

am skip reason: Change-Id I58f93853b625f5ebe5b111c246d42ca1e3f2cc83 with SHA-1 10f0fc2b24 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I377587d15dea202032a2dbcfabe39fa48228aece