Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I6f8ce0cbe10849d17c39e064a27d231de24ae88c