Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit f10a758ebd8f96de1f6a5f578f69907291a3f8c1)
Signed-off-by: wzx <wuzx1226@qq.com> (cherry picked from commit 34020156caf7cc8c6da7f0b03461e7e8e728d5b3)