Merge "NetworkStats.Bucket API polish." into nyc-dev