Changes in wait_for_condition API.
 Changes in wait_for_condition API.