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