Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iae5d21d5dc39ae5a2b147da1159bcac56439d2b2