Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I33f7c91200baa9ee69532b7b53584f508162bd13