Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I545b001e94818e996ca7a16ed0c28a9b613ed3ed