Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I58c017524a1349c15c38ede65233da3e742375cb