Merge "Migrate CT namespace to "network_security"" into main