am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1

* commit 'd968670d8369e5d92ba9b7a45b3804d692a05a4e':
  Conservatively trim data usage stats.
tree: b46e36eea80c27a95c3f62f53560ca57920b9b03
  1. core/
  2. services/