am f615cf6f: Merge "Add 5 minute time out to host run tests."

* commit 'f615cf6fdd0042d4a3f62d2b4b81dfa1ed6f8284':
  Add 5 minute time out to host run tests.