* "rewrite the test case"

* "follow comment"

* cherry picked

* "cherry picked platform"

* "add comment"

* "fix ci"