Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I4f37e5b61caebc267f43321ca324203f4a378f68