[ros-diffs] [janderwald] 39107: - Fix build