remove timeout option and add requirements

Change-Id: I8a143f2c613e82c5aada35d086640bc4b4e48c05