Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie758ffab3bc6bfea52b8a1a1d06ebbbd28ff136b