[ros-diffs] [jimtabor] 45649: - Add patch back after sync.