Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0921ede1e25363a8fb813af8ba637874c4425f61