Merge "CTS v2 integration for deqp"