* sync from upstream
Signed-off-by: jikai<jikai11@huawei.com> (cherry picked from commit 40d66d1bd81198bbdd4e01a096e15c31d78f1802)