Merge "Remove TEST_MAPPING duplicate imports"