Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I351af1e728d4eb239c44ef5e0847f61edcf25b4c