[ros-diffs] [akhaldi] 71405: * Sync up to trunk HEAD (r71404).