Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie3693e3d815995ab72063ebc1dff471a8a740186