Merge "Try to work on test flakyness." into oc-dr1-dev