Merge "Fix an NPE in BatteryService" into sc-dev