Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ibb890234981cfc920718ebd65541faa22a085d85