[ros-diffs] [dquintana] 62756: Sync with trunk r62754.