Signed-off-by: Neil.wrz <wangrunze13@huawei.com> (cherry picked from commit 6d2e2c374077e6a83526b89bdd9b5ebc4a78d730)
Signed-off-by: chengzrz <czrzrichard@gmail.com> (cherry picked from commit dc4eae55c4237b309fac2ce8436c97365cb174dc)