Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I3ffca5e81dfc2cf130b9d5088bf69ea3dae41496