Fix passing envelope variable as timeout

The envelope variable is being passed positionally in the timeout spot.

Change-Id: I64defdb0a9544d8c2ae69b38f723937b324ae504
Merge "Fix passing envelope variable as timeout"