Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ice39a7fc8ffe142c19d0ca1a14c8d03bdc13f75f