Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I93766b330347e9f59fd32c1cf4ef5d4192cd649e