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

Original change: undetermined

Change-Id: I8e7a0d3054e4051e4a6158f9cf4075dd74090138