Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I13f64871b571c72873b9762a7a2b1352356fc7ed