Merge "Modify Telecom CtsVerifier strings" into oc-dev