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