too enthusiast... OMNI --> CM

Change-Id: I513adb532082d27458479c016dbb5fb209f05fa7