Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie58f1f4e5bebb337139c8ec3f0449e0dcdeab626