Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev