Merge "Remove unnecessary wait_for_server_status"