Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I7c47826591d9f5fc90aa6f76cb3f5008ed64c214