Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ife4cd32d8c67dcccccb7399af3413da8cf0148c6