(cherry picked from commit 3c4142f44bd8bed125afa5c42a40e2b38bb7846b)
(cherry picked from commit 6708221d13a3e37207f8da1974da679a3c18fd01)
Signed-off-by: cherry530 <xuping33@huawei.com>