Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ibf20db35bbf58960bd6ac029a22ae6265d55a00d