Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ib7a643d214adfbc3ebfdfa048b0799793d3b3ebd