Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com> Upstream-commit: c52a373bc8c914f41b0451964e15c007f2754436 Component: engine