Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I61cb533eb0d28139dd0f19b5a701c2e5dd73b743