Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I19e6564613232180fc4bac781eae1866aba62a6a