Code for delaying/sleeping has been unified into one location. Change-Id: I234f3e1be667539e8126f7ed24aec95fe14284b3