[ros-diffs] [dquintana] 63846: * Sync to trunk r63845.