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