Add a timeout option to the scheduler

Change-Id: Ia796c5027c8faeefb9ddf48d88583d3d7901448d
Merge "Add a timeout option to the scheduler"