Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie4be02d8ff9d8fca43f2266ddb26cfd106b6d9b4