[automerger skipped] Mark ab/7061308 as merged in stage. am: 167dafe30c -s ours am: 26f7a77331 -s ours

am skip reason: Change-Id I061bdba426828811c7f8afbc6a5aefde70814203 with SHA-1 8b056f9530 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9904cf4c4b303e648323cd1c7ce2b64d8f6c92bd