Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Id03bb380a75333d3692acdba9ad1bf44c7e90776