[ros-diffs] [dquintana] 63271: Sync with trunk r63270.