Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I9e275a8e5755c83362df41a5c57556cfbbb5fda8