Created by: wangkuiyi

Fixes https://github.com/PaddlePaddle/Paddle/issues/9700 Fixes https://github.com/PaddlePaddle/Paddle/issues/9720