Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I2777ee69400ad127728937b608d8f70c220c7ddc