Mark ab/6881855 as merged

Bug: 172690556
Change-Id: If8ab47cdd88b03e878c6b7895e757b65451b23ba