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