Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ia19e795e0c871ac6654c2496f50fb657a606775d