Merge "Enable some redefinition run-tests in CTS"