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

Conflicts:
	res/values/ose_strings.xml
	src/com/android/settings/ose/NavigationSettings.java