Merge "Update network logging metrics" into sc-dev