Fix address-related tracing prepopulators #3988
Merge pull request #161 from NUBIC/3988-inaccessible_tracing_instruments

Fix address-related tracing prepopulators #3988