Merge "Handled failure of execvp and increases am timeout." into nyc-dev