Signed-off-by: haozi007 <liuhao27@huawei.com> (cherry picked from commit ce72f544493f2b71d484c14711336a7c2bb82815)
Signed-off-by: gaohuatao <gaohuatao@huawei.com> (cherry picked from commit c5664a865cb1b0d1ced2d05e46165956150cb617)