Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Icad30d96e3f03e10e0cbdca3fb7cc6b5b1d28594