Merge remote-tracking branch 'slim/kk4.4' into backup

Conflicts:
	res/values/ose_strings.xml
	src/com/android/phone/CallFeaturesSetting.java