Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ia652f2cb789d8f581aa97f9896719d439629537c