hulk inclusion
category: bugfix
Bugzilla: 5520
CVE: N/A

----------------------------------------

This reverts commit 040f0086dd756ebb579b17d34e0f039e705938f5.

A new version has been merged by mainline. So revert the old version and
apply the new version.
Signed-off-by: NXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: NHanjun Guo <guohanjun@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>