Automatic merge from submit-queue (batch tested with PRs 45807, 45814)

Fix invalid bash script in unit test.

This change fix such error when we run "make test":
    "find: invalid expression; you have used a binary operator '-o' with
     nothing before it."

@deads2k 

**Release note**:

```release-note
```