Signed-off-by: vegbir <yangjiaqi16@huawei.com> (cherry picked from commit e48d5ef7f52378d7ca457d3312f5dcf04f2fb6f8)
Signed-off-by: DCCooper <1866858@gmail.com> (cherry picked from commit 4d19602e9c005b4f9f5ab38771d726d313e9a884)