Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I4fcffc97d9afbdbb20cb80573411188c77ce23ef