Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Icc097331325cd6b9e0da7dfd144c3a6b6e98921a