Merge branch 'head' into kitkat

Conflicts:
	src/com/android/settings/Settings.java

Change-Id: I6a9d665f5c95902d4edbdec931bcacdc18449870