Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev