Merge "Fixing flakiness in robo tests" into main