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