Merge remote-tracking branch 'PA/kitkat' into kitkat-staging

Conflicts:
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
Automatic Translation Import

Change-Id: I02e2c6e4422b6471b5d5297e687e7c7d4b8b7b90
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging
Merge remote-tracking branch 'settings/kitkat-staging' into kitkat