Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0db06e3f5f8b595e65b778963032e4e97623e657