Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I2be31ae9a01beaa20a6afde882b9c578eff8e85a