Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Idbd8764275a12a8eb718a5b78db72e2445dc4ab8