Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev