Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I25d60db041007403a0e035e4a0645d1a50b3ef0b