Merge "Cleaning up NetworkStatsManager." into nyc-dev