Signed-off-by: liyunfei <liyunfei33@huawei.com> (cherry picked from commit 59d3f9de0c411f1de233ebf3f86c8f3b8bd01108)
Signed-off-by: liyunfei <liyunfei33@huawei.com> (cherry picked from commit 5cba42c99e63808e3ba4cbaa37c6789d40cf7995)