Mark ab/6881855 as merged

Bug: 172690556
Change-Id: If0ab947f5afbd04e4022ac73bd6e36d2f355f9d5