Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie45d5df4f406757cd5c38e9f39a28e21e6aa46ba