Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I4dd1a71697f1647ccba1517545f3be401ba39642