Added configuration for timeout

Change-Id: Id481a680ad2d9d4594bce014cc2a4492709d7955