Merge "Hide NetworkStatsFactory class"