Merge "Enable some redefinition run-tests in CTS" am: 66f43b988a am: 8fcbf927bc
am: 62101914cb

Change-Id: I85d6e17454b59c99708d8790120f57d9d3174e80