Merge "Fix a NPE in BatteryStatsImpl" into pi-dev