Mark ab/6881855 as merged

Bug: 172690556
Change-Id: If56ace617ad37738ce59fa5bea560cbed43a5d4b