[ros-diffs] [hbelusca] 73752: Sync with trunk r71183 (before the revision that moved around the PSDK headers).