[ros-diffs] [akhaldi] 71246: * Sync up to trunk head (r71245).