Merge "Avoid skipping test if it's supported." into udc-dev