Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I7fd608e882016e183f50f31c74d792cfa555ed37