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

am skip reason: Change-Id Ice39545d342b3c611e4db593ed70908f65def838 with SHA-1 04a49a200c is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb9886c8560d5a9730c3e89bdf2d39bebee7fd07