[ros-diffs] [dquintana] 63879: Sync with trunk r63878.