Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I509db478b86ca6d376c28d2b65afeacda4e71d0c