Switch to CM device_common