Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I893b303f80a1b7cd1fb5a1fb93b9520619e4b562