Signed-off-by: haozi007 <liuhao27@huawei.com> (cherry picked from commit f60fbbd3e3b5835515ec02a3c7711ed76d61dc7e)
Signed-off-by: chegJH <hejunjie10@huawei.com> (cherry picked from commit 95fdd54c792798c045efaa119e1f479a5d86ab72)