Merge "Sync TEST_MAPPING file from master branch"