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