Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Id0bb5d35ac9267508ae77955e298e7b51581ec6c