Signed-off-by: chengzrz <czrzrichard@gmail.com> (cherry picked from commit dc4eae55c4237b309fac2ce8436c97365cb174dc)
Signed-off-by: haozi007 <liuhao27@huawei.com> (cherry picked from commit f648bdca3d5208d00febbd8deaa1a1733c1dd6bb)