Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Idd33cef64f460add634ce82cc7a002ab952db478