Merge "Always allow Ethernet to be an upstream"
am: ecbe6fa147

Change-Id: Ic9fd4bfd6ba7ecc00552019f804b87bc203ea98a