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