[ros-diffs] [hbelusca] 75155: Sync to trunk r75154.