Merge "Migrate to override_role for network tests-2"