Adding timeout support

Change-Id: I43d8b98211a5ca6fd5ac339380ba77df90033620