Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I9ecdb6b4c377eabf1d0778db70814067f9bcfb74