Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I97e4dd2dc5d2498a29b4b5c578b50304994affcc