[ros-diffs] [cgutman] 57174: [AFD] - Fix some size assumptions that fail on 64-bit