[rhel7-branch 2/3] Use Size, not int, for size (#1076055)