[ros-diffs] [akhaldi] 47698: Sync trunk head (r47697).