switch to CM for common

Change-Id: Icc93364b2f226d50786cce9f2251e60b4f7cd980