Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I43e10995ccd41a5edb231ed6e5cec7ddcad29efa