Mark ab/6881855 as merged

Bug: 172690556
Change-Id: If1d81870f9e0fb1ea920ddc55032790770a75513