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

am skip reason: Change-Id I99d1c607b381288c4a0c4c777c019921181616b0 with SHA-1 bfa72e915a is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I678caca49792ce85c6043782719e19517412abb0