[ros-diffs] [tfaber] 59439: [PSDK] - Declare IID only once aka fix GCC build