Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I4140087ce9a38e5861ea69b45176be2dbd2a70cd