Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ia8931182a6ff053ed18c97a1f19af2d92ccfac7b