Merge remote-tracking branch 'base/kitkat-remix' into remix-legacy

Conflicts:
	core/res/res/values/pa_strings.xml