Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0e94d83bd37401ac9262330fedfd3cdefd554b9a