Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I5baf2d37729d6e29baaf556d50ad6b3f2f91f95b