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

am skip reason: Change-Id I1b7fe671562def65f089094e56fda09deb14bd7b with SHA-1 716864e6d7 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c1fabdd0a9416573e9ce98a14b6658bff93158b