Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Id9a818fa1e9d85eaf52eb5524e0c513d373dc487