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