Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I1f2a672465b3c36f774cbbce304a5a438245e4e4