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