[ros-diffs] [dquintana] 64405: * Sync with trunk r64401.