Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ifb762e70466bfdf0992a586cfa75876de5bbc3e8