Merge "Remove Network, NetworkRequest metrics from jobscheduler" into sc-dev