Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iffe811c69ed12f0ee531182a41c99d1d4a5ca7cd