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