am 50ad67e4: Merge "Add better timeout mechanism for running commands."

* commit '50ad67e4ce6b07b5f5f4649ace81ed9a8b2c2eac':
  Add better timeout mechanism for running commands.