Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iaf6d4294144da438dc2f4546c7698e23d020bb01