devices back to cm-11.0 for now

Conflicts:
	default.xml