Merge "Remove Thread.sleep() calls" into udc-qpr-dev