am 36e53bb8: am 1770f9cf: am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds."

* commit '36e53bb8aa6db4ac101f88a7394f5011643693e2':
  BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds.