Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1