Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iaf7d5cf939e4e583abe1896d4d095b7f9734b5a5