Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iae2ad045d7705517ab11dc89ae9fdab5b1de121b