Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ic5c2f167b08b651a7e5aa10b8fd8bfef141aec21