Merge "Always allow Ethernet to be an upstream" into oc-dr1-dev
am: 592e85b4fd  -s ours

Change-Id: I3bdfdb50557093b906a92ccebec2212274f9f255