Merge "Close InputStream in BatteryStatsHelper" into nyc-dev
am: c14893bf5a

* commit 'c14893bf5a2ad76ad6279f09b66020610e32041f':
  Close InputStream in BatteryStatsHelper