Merge "Move NetworkStatsFactory into service directory"