Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I8c1f7699913576b8ddee52242131f7c801ea7075