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

Original change: undetermined

Change-Id: Ia4667eca5e7858b58910a3bc6bfac9dbd74f486c