Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I424179b2e33f5eeef8ff104e2829c9819a6454ff