Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I67310fef6e6ac460bb94cbe6b2c1aada8dd66eef