Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ifde318c142c5cdfcb116079229543bb16cefeb10