Merge "Disable flaky test" into udc-qpr-dev