Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ib34a906538821d3fecbdb4dd77b8803ad2e27659