Merge "Fix car CtsVerifier bug"