Merge "Add constructor with type and address for DeviceDescriptor."