Handle 10 sec CM and make CM detection logic aggressive.

Aggressive logic doesn't give a false positive at this time.