Updated sanity-check to retry connections if RPC timeouts occurs