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

Change-Id: Ia843f6631258a10f546e04c4b26ffa76d84b25dc