Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev