Merge "Migrate to override_role for network multiprovider tests"