Merge branch 'master' into HEAD

This will override some network choices commits

Conflicts:
	res/values/strings.xml
	src/com/android/phone/MobileNetworkSettings.java

Change-Id: I3595202f5067bc3618dfae98f579e60fa941d32a