Merge "Fix null pointer from PowerUsageFeatureProvider"