am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev

* commit '2529d39d3184ab66207f3fde9f2106276a2c1c16':
  BatteryStats: Use proper power calculator when energy data is received