Merge "Improve flakiness in tests" into udc-dev