Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I06940bfd312ff99963f1c79fd9ff4ba7400998f5