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

* commit '9b02ecfe308302eae98d50fa165b1faae695f3df':
  Handled failure of execvp and increases am timeout.