Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ibeaafefc5361afefd4668c85f2822b86649d4965