Signed-off-by: cherry530 <xuping33@huawei.com> (cherry picked from commit 5327ddb2367a112f2ef6b447f7ebb257bc567626)
Signed-off-by: cherry530 <xuping33@huawei.com> (cherry picked from commit aaab371e6ae29ed833e416b785584031edf833f0)