Signed-off-by: Evan Hazlett <ejhazlett@gmail.com> Upstream-commit: c00138748daeef52d353dda66c7b89322b7708fc Component: engine