Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ida6b655c4379109841748f42ad30ada3757cdf9c