Created by: yaoxuefeng6

PR types

Others

PR changes

Others

Describe

cherry pick https://github.com/PaddlePaddle/Paddle/pull/23376 to 1.8