Squash 4.3 changes.

Conflicts:
	overlay/packages/apps/Phone/res/values/strings.xml
	system.prop

Change-Id: I491e95a4a3e6d996d173acbd4d06bdc6d5e29351