Merge "Fix #62545908 : 'metered' network jobs run without network" into oc-dev