[ros-diffs] [navaraf] 16967: Remove duplicate definitions.