Mark ab/6881855 as merged

Bug: 172690556
Change-Id: If9cf64206ba6c851ac2d72a5682a5481b25f4764