Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I158ba8f69a42688c117da6e6ebda04ea76323772