Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2-defy

Conflicts:
	res/values/cm_arrays.xml