[ros-diffs] [sginsberg] 43067: - Fix kernel build regression for MSVC from 43014