[ros-diffs] [dquintana] 63888: Sync with trunk r63887.