Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I248930712914393022e6a51c15ffe92a789edc26