Add CM specific configuration

Change-Id: Id442974791a6f1009b093546806598c4d0edc887