Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I2f0f1ccade623f4ccfee8e39f249970bdd2af3c3