[automerger skipped] Mark ab/7061308 as merged in stage. am: bc03a97632 -s ours am: 19f003e9d1 -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: I3f7ef0779b32d4f180987e8f99e7bb2416c0641e