[ros-diffs] [tfaber] 66919: [VMWINST] - Fix build