[ros-diffs] [pschweitzer] 58651: [CMICPL] Fix gcc builds