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