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

Change-Id: I3d9dfe36dbc2261e0390695940602769cfcc46cb