Signed-off-by: Jie Yang <yangjieyj.yang@huawei.com> (cherry picked from commit c7db0977213860987bf1883895ee02025e0aa3c6)