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

* commit '5fba52d09afca426be0e275cd34f1e68bc0f1fa1':
  Fix --jvm on run-tests 960 and 961