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

* commit '858e4a6f89c6d2b09d65ccc6907aa357f7e3f125':
  BatteryStats: Use proper power calculator when energy data is received