Signed-off-by: Neil.wrz <wangrunze13@huawei.com> (cherry picked from commit 6d2e2c374077e6a83526b89bdd9b5ebc4a78d730)
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit c958fa0564fd769f1862b9fb757a0ca48274d123)