Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I28cb9d1e2c90642d9fb5c0193ebdb24f1250ccb8