Support minor PSOL API change for matches_device_type