Mark ab/6881855 as merged

Bug: 172690556
Change-Id: If56e880641c531f6c0746c643f50d0471ded220e