Created by: gongweibao

PR types

Bug fixes

PR changes

Others

Describe

Cherry pick https://github.com/PaddlePaddle/Paddle/pull/26841