Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev am: 6b432fa255
am: ffc1208daf

* commit 'ffc1208daf819e6f4cb87228f0ad58354999914f':
  Restrict TrafficStats due to privacy concerns.