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

* commit '6b432fa255db0a24388a0698cfe3e01190a4f2ce':
  Restrict TrafficStats due to privacy concerns.