am 112c1dc6: am 6a8d1fd6: am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev

* commit '112c1dc63adbc36b1bd50dac24d1ea39959ef0f2':
  Fix Array Index Out of Bounds in BatteryStatsImpl