[ros-diffs] [tkreuzer] 39625: fix PSEH build for x86