Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit 36c9813fa282d735711957553cafe970d59f8d33)
Signed-off-by: haozi007 <liuhao27@huawei.com> (cherry picked from commit 9acff032379eccd589e08063d4bf812f0c2144e9)