Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie831223c0a12c97e651c0742910808e9830efec8