LPS-32110 Fix "test-sample-sql" after SF.