am f272b9e7: Merge "Clean up the sleep()\'s after poking init services"

* commit 'f272b9e777de92f96b9298889bf145e40c5db2e3':
  Clean up the sleep()'s after poking init services