Created by: wangchaochaohu

PR types

Bug fixes

PR changes

OPs

Describe

cherry-pick https://github.com/PaddlePaddle/Paddle/pull/2708