Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I5a2f345d46f744263cfd29385e63f03aaf737ebf