Merge "Fix a NPE in BatteryStatsImpl"