Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I716a995b7007c306055473058b0c96f34126ba69