Merge "Prevent tests with reboot from running during presubmit"