Use LocalDefId for import IDs in trait map
#73357
+38
−73
Merged