Merge "BatteryMonitor: batteryStateOfHealth should be a property"