Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I836982f948d75d6c96947ea342bb19c7a54cbdd0