Automatic translation import

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

Conflicts:
	res/values-zh-rCN/cm_caf.xml
	res/values-zh-rCN/cm_strings.xml

Change-Id: I2046234db8d0dab3d4d221d2730d5ca10b2adce8