Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Id3c1ade1559ecedbcaf994f1d4bbfd52bb5e57bc