Pulled more updates from java submodule