Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev
am: ed1519d095  -s ours

Change-Id: I61101f481d6508786664d49a7f7a560a29464a8e