Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ia019635f3330f0213600650014ab6fc91d9aa12b