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