Signed-off-by: Sam Abed <sam.abed@gmail.com> Upstream-commit: 79f704490c64c74746eefbddb642b2071203fcbc Component: engine