Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I932d45caeecf248f20266ceef7c5b933597787cb