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

am skip reason: Change-Id Iceabdce06b1db670b9b46c63f47138aab6893126 with SHA-1 e8f8d4d2c0 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa8cd1df6768aca8340da4b95a0794b6145bee01