Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iee171f5cc41e989e8aa5ced5f1c26e3c2821fb61