[ros-diffs] [tkreuzer] 46545: Fix build