Merge "Migrate to override_role for network metering tests"