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

Change-Id: I9937297727aa1a063e499fccd5833ace229b1e8a