Switch to CM hardware/ril for device consistency