Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I162644558245c0be8c6852a3036fe4a8ce60b1c3