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

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