Improve logging when auto-clustering fails.
Merge bug26336