[automerger skipped] Mark ab/7061308 as merged in stage. am: bc03a97632 -s ours am: 19f003e9d1 -s ours am: 3ca5ea6709 -s ours

am skip reason: Change-Id Ic33042fea356fbb82b777322a671b975a606cda0 with SHA-1 9a962272e9 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c3135dd7b89a3078bf7ff694673e16a630770a0