Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie474b8223e6a5396fd09a9a6855491dbcb3f5590