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