Created by: wangchaochaohu

It's same as https://github.com/PaddlePaddle/Paddle/pull/22061(because CI problem, add new branch to merge code)