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

am skip reason: Change-Id I6474d863ec9d6cb1630c529687be4465f1f8f295 with SHA-1 08133d2cb6 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f9148b126261c2e9b3d3fdaa82cc6e8c797e864