Merge "health: batteryStateOfHealth should be a property" into udc-dev