Created by: grygielski

PR types

Bug fixes

PR changes

OPs

Describe

Cherry-pick of https://github.com/PaddlePaddle/Paddle/pull/25137