Merge pull request #14921 from aaronlehmann/int64

Fix uses of "int" where "int64" should be used instead