Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I0566359d06cd68e9801083ef067c6c04396ce6ab