Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie06f21fba8d2dcb1f315dfb7f77487af1262a8fa