Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I7392107d85165c8670ed0ea232572e7ccd7288c2