Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I87d97977f7b2e0c64b6472011831679a358dba57