Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ia6d26cd7ad7799f708027491bd3fa584dd6dc9d6