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