back to cm for non-specific repos

Change-Id: I7cbb5b895abe1441fd1a2783184d5870e0555e30