Merge "Move findPreferredUpstreamType into UNM"