Automatic translation import

Change-Id: Ic2c7c2171fdc17d1cab0678ca1cb849588e30296
Merge branch into kk_mkt

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

Change-Id: I741418dc4070b40c524dc233120b7785c2d332c9