Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Icddc66160fb2b377a09c435dbda4f0d068eae9ca