Switch to CM SU

Change-Id: I929c404399caf7ac83b134e4c3baca6861b0fd92