Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie4b6bbd9eaa7268839c04158681beb90754e3d08