[ros-diffs] [gadamopoulos] 50358: fix build