Merge "Add concept of device class."