Merge "Use import for test-mapping rather than requesting files remain in sync" into main