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

am skip reason: Change-Id I1ddf3428bf4ef34cdf7034f2e7a48c015a825055 with SHA-1 86cbfe134d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I008b78458a333b8a7db63218afff2f38d98f3269