(cherry picked from commit 6404e8904b645dca6cd75aa799e714b6874c4818)
backport from upstream 506e47da1d Signed-off-by: Lu Jingxiao <lujingxiao@huawei.com>