Merge "Fix transient failure in select_smoke test."