switch to CM for common"

Change-Id: Idac23087837de48eb2e6beff595c8af71e1e189d