Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ic988f537d995d1d8c3237415f60e8cdfc2d2ff5f