move back to cm vendors

Change-Id: I5b984b00d5cd9d5488afbe3e035507078d9d05a7