Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I6b8c75ab01b7dd0eeca40bc14514b883c4422dff