Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Icce1e03db7dca9a349f53432c63f6f19dcfd2ab1