hulk inclusion
category: bugfix
bugzilla: 13267
CVE: NA

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

This reverts commit f21e16fe09f32e389c66b9a83c7e47dd1e3e6ce6.

Sync code with mainline
Signed-off-by: NYueHaibing <yuehaibing@huawei.com>
Reviewed-by: NMao Wenan <maowenan@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>