Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I94c628e56fb6fb8e7fc5c3e46ce72dd2362299e3