Fix uses of "int" where "int64" should be used instead Upstream-commit: 7374852be9def787921aea2ca831771982badecf Component: engine