Merge "Add TEST_MAPPING for Compatibility api"