Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I5a2ebddd30b90a93aee28f1d103f887107baec57