Created by: MRXLT

PR types

Bug fixes

PR changes

OPs

Describe

cherry pick https://github.com/PaddlePaddle/Paddle/pull/26711 https://github.com/PaddlePaddle/Paddle/pull/26962