hulk inclusion
category: cleanup
bugzilla: 14629
CVE: NA

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

This reverts commit 437f99ac3ba010dcf9b2c824995a41fe643c18f7.
Use LTS patch to replace this patch.
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>