Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	res/values-ar/cm_strings.xml
	res/values-ca/cm_strings.xml
	res/values-cs/cm_strings.xml
	res/values-da/cm_strings.xml
	res/values-de/cm_strings.xml
	res/values-el/cm_strings.xml
	res/values-es-rXA/cm_strings.xml
	res/values-es/cm_strings.xml
	res/values-fi/cm_strings.xml
	res/values-fr/cm_strings.xml
	res/values-hu/cm_strings.xml
	res/values-it/cm_strings.xml
	res/values-ja/cm_strings.xml
	res/values-ko/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-pt-rBR/cm_strings.xml
	res/values-pt-rPT/cm_strings.xml
	res/values-ru/cm_strings.xml
	res/values-sk/cm_strings.xml
	res/values-sr/cm_strings.xml
	res/values-tr/cm_strings.xml
	res/values-zh-rCN/cm_strings.xml
	res/values-zh-rTW/cm_strings.xml
	res/values/cm_strings.xml

Change-Id: Idcce75ab6015f06f01dfd2815dacaac20647f48d