Merge "Close InputStream in BatteryStatsHelper" into nyc-dev