Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie2629d70fba99bd63485a331a02ec0f85b15515d