Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Id68ac84043dc8a8ceacb5e54be1d77beff8e16ed