Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I579c0f4ebae53946620248cd7aefaab822689f07