Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I81f11da8fabf90e92e4c7db555554e99ff2df564