Signed-off-by: Jason Sommer <jsdirv@gmail.com> Upstream-commit: 0826ac1581bdb71b889a0cb260422ce985aca317 Component: engine