Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I379c6ed0afeac0d55e51533bf055d5841802111c