Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ic7ff06eda9a716782cb4ed09bb121710db262730