Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I739bc2c220da237b37b959230ce8d438b33bcc10