Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I73b2c81978eb66b0c0af85c849a6ed08ac158bc4