Signed-off-by: haozi007 <liuhao27@huawei.com> (cherry picked from commit ce72f544493f2b71d484c14711336a7c2bb82815)
Signed-off-by: chengzrz <czrzrichard@gmail.com> (cherry picked from commit 18c5a85737d59815cb5d0a9bcd2b46581873db0e)