Merge "Disable incorrect CtsVerifier tests" into pi-dev