Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I6abcd4d0f08bc000e564cf902b003f459d70c1fc