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