Fixups.

Conflicts:
	res/values/strings.xml
	res/xml/carbon_settings.xml