am 9f9541e9: am bc91d594: am a109cc1b: Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev

* commit '9f9541e99243ef84af374c1576f369ee7a31a382':
  BatteryStats: Wifi energy data is sometimes wrong