Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I356b1aa97cbacbc209c0a5fdbd868b58f924ca29