Merge "Replace sleep with PollingConditions"