Mark ab/6881855 as merged

Bug: 172690556
Change-Id: If12bdd544288a648a87d152d080ea804f9005f62