Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ia661dec56f9e1dee2650ef3b5442fa99ab5e14c6