am 1fa6846b: am 948ac4fa: am 1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev

* commit '1fa6846b66ea94c0f0beabdac1bf0e56955bb8b5':
  BatteryStats: Fix issue with method parameter order...