Merge "Fixes some of the flakiness in Telecom" into oc-dr1-dev