Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ia6891e0924374e831be2959d60de2423ec788880