Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I494589995671d4b7fd61c1521e0e5d1636384f24