some experimenting
Merge remote-tracking branch 'origin/kitkat' into kitkat

Conflicts:
	res/xml/device_info_settings.xml