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

Change-Id: I3e695c75e3e06f0bd70568b462f0ba9cf307384c