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