Switch TSK, found a Java regression

(cherry picked from commit d6a1799d37c1d15d4b3df32a62b8f5121387220b)

Conflicts:
	git_submodule_init.sh