Merge "Make the run shell command more reliable for connectivity jobs." into main