Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I4edc064b9a87da525672e61919ec8fb59a70202e