Merge "Improve linker_namespaces CTS test" into nyc-dev