Signed-off-by: cherry530 <xuping33@huawei.com> (cherry picked from commit ef9fbe77429d10e4c2ab09105dd440fc7bd7c7db)
Signed-off-by: cherry530 <xuping33@huawei.com> (cherry picked from commit 01ef8c231d9e70fa870706467b22c6f92e669103)