Merge "connectivity_native_test: remove retries"