Signed-off-by: Chris Khoo <chris.khoo@gmail.com> Upstream-commit: b21751da907cb2889aa9ca95ebf6c4c66e6131a6 Component: engine