[ros-diffs] [cgutman] 36170: - Merge r36169 from aicom-network-fixes