Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I62f02f7f77ff3e7ce57ecfb82c9cdd7171baff1d