Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ib87a5aa6f9b435898bd0885e996397a0c5eef23c