Merge "Grant OVERRIDE_COMPAT_CHANGE_CONFIG to servicestests"