Merge "Ignore flaky test" into udc-dev