Signed-off-by: haozi007 <liuhao27@huawei.com> (cherry picked from commit d3627b61f81a51403db86d87b6c6611c8a99a684)
Signed-off-by: haozi007 <liuhao27@huawei.com> (cherry picked from commit 244b9728646d06f25f4581a0a419e58cca5e68f0)