Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ia90a4c512b6d7973f7796512ff4043e7d5c64d33