Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I8f5f3ce30f343367e53e7604408af43395f9af36