Putting into our new format for cloud Upstream-commit: 20b1aa08f8112cb2176d75e9f6fa27eab0ea5e44 Component: engine