[automerger skipped] Mark ab/7061308 as merged in stage. am: 05ca4d63c0 -s ours am: 68a63f8f9a -s ours am: da98e66342 -s ours

am skip reason: Change-Id I8b470b29f41a0b572fa2f85c7cec0368bfb6b032 with SHA-1 35c8a3d347 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2775d260379ff2fb4e1cbd695929ac0bd9f5fc12