Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ibfbd55f16eadd4e2ff2a205736b1591b40741507