hulk inclusion
category: bugfix
bugzilla: 13690
CVE: NA

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

This reverts commit 74711645cf8a3058b353479c1d03ef85330219b1.
Use LTS patch instead of this patch.
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>