Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I809725449c2e567063d661f09da25319e9653364