Signed-off-by: Neil.wrz <wangrunze13@huawei.com> (cherry picked from commit 669b58aed9e43715d3d2f96f05d9b15f14c9e8d3)
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit 97df963d711d17bfd927645c3a185f21abf839dd)