Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ic79b48e643470078cdfe79432dba4e4380713901