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