Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iaf8abd9a14e112f4fdcc475dbe68436399d8a104