Merge "Adding wait to test if the flake is a race condition" into udc-qpr-dev