am 86f97eda: Use the device type from saved properties instead of assuming default

* commit '86f97eda524568f2d264186844450db5e56dac36':
  Use the device type from saved properties instead of assuming default