[ros-diffs] [tkreuzer] 35772: fix for x86 build