Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie992bc9923c0d5830bb9d2b5ef5d77d48eed6d23