[automerger skipped] Mark ab/7061308 as merged in stage. am: 05ca4d63c0 -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: Ifa9babe6e928a5540f2f792b4a3e43919dbc4d1e