Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I8cbd032e93be1804959a1fc714a230ea7a556337