Add support for the timeout property.

Change-Id: Ida74df707c4ca0b4ee7a7d73b9db40ba0112f9bf