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

Change-Id: Ia102e1ea73a0b98117d29c017980e7bff4d240f6