Signed-off-by: Brian Goff <cpuguy83@gmail.com> Upstream-commit: 503b03a3f090550052af960ece2e71d54c1fdf0e Component: engine