Merge "Move findPreferredUpstreamType into UNM" am: 32703994fe am: 8bc87070f9
am: ad652cbcf3

Change-Id: Ifa1a34a1fb32149085421a63cb0f2586d2862d6b