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

Change-Id: I7dc86c3fc3c10847c5ad674d242531c5221e81d1