Merge "Add batterysipper type check in PowerUsageFeatureProvider"