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

* commit '6a8d1fd62f73a241e7962b3baa3720a6dcd0767b':
  Fix Array Index Out of Bounds in BatteryStatsImpl