Merge "Fix --jvm on run-tests 960 and 961" am: aac223f83b am: 5fba52d09a
am: 672c3035cd

* commit '672c3035cd0c86ed0a673ffa8368a2b512b1423a':