Merge pull request #17638 from calavera/move_net_stats_collector

Make the stats collector to collect network stats.