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

am skip reason: Change-Id I395973694367a1ab04cf8b3c3a3a3df5ac63cd52 with SHA-1 825f8f52c4 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01d377a2babc97bfcef990637fabaec7d5dd603b