Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I7d233d11bbd627a9f7a8d1d34d72b43188b46ac5