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