Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ia6f3ac4ec58e4eae1e00388b07362f2412ca4cfd