Signed-off-by: wujing <wujing50@huawei.com> (cherry picked from commit 7c467db3b66e1a159a0b844b3c8935deab00dd5e)
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit 99b8724beaca69f81818595892e2731341d40730)