Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I323eab101afcaf2acfb13d56c88440ab9b8fd05c