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

am skip reason: Change-Id Ia6f0b71fd4822d67d88ff6dd585992585c2b9263 with SHA-1 bc2f2a9b13 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d16879790a3bda50f2f571103c471768aaca386