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