remove isCM dependency

Change-Id: I192ccdfcaf0feb5a482b07eb152c37adfeb4cf7d