Merge remote-tracking branch 'upstream/kk44' into kk44

Conflicts:
	core/java/android/provider/Settings.java