Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Id0e0d6e37c13c3649e96b36d73d9f314876f9db9