Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0bec6b9ef8ac6eda24d3dfb3961409b12c34e191