Automatic translation import

Change-Id: I0e235b7878f00f939f668c762efc99066d60a127
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	res/values-zh-rCN/cm_plurals.xml

Change-Id: I708e59c2e6c0103ac4e26d62539d268a0af8e93b