Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev am: 868a859fd7
am: 0169932c51

Change-Id: I4039c5b4b300c9029c82fecf36163e444768eaaa