Merge "Fix NullPointerException in BatteryUsageStats" into sc-dev