Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I930620d488f86ec032dc7280988f752faec14191