[PATCH 06/19] Use correct means for getting device type in the custom spoke.