[ros-diffs] [dquintana] 64510: Sync with trunk r64509.