Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I65147cbdb0388475f362d7c3e3e68e83545fc221