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

* commit '174cd78000d4a54926367ac94a014e8172f65414':
  Fix --jvm on run-tests 960 and 961