[ros-diffs] [hbelusca] 74744: Sync with trunk r74743.