Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I00b5deff893120e6e73189235fdb85d206241b47