Signed-off-by: Eric Rafaloff <erafaloff@gmail.com> Upstream-commit: 6abe160eaec49c693b69d14304fe39d78ea4abb4 Component: engine