Merge "Increase the maximum shell command length to 4096ish."