Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie8b8b4ac8056764a622a180aebd5067eb1a06df7