[ros-diffs] [dquintana] 63788: Sync with trunk r63786.