Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit 07838725fddb09d7aac3326ff034cb8069860305)
Signed-off-by: chengzrz <czrzrichard@gmail.com> (cherry picked from commit 1fa1da78d37881492ff3d5cf03fdedb38bacea96)