Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iec70071d4b31fe9a8017e56240abf5606d39d714