Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	res/values/cm_strings.xml