[ros-diffs] [dgorbachev] 40983: Fix build