Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	core/res/res/values-mcc260-mnc06/config.xml

Change-Id: I533529c34c00c9ea376ba28f315ba1207804e845