Merge "Always allow Ethernet to be an upstream" am: ecbe6fa147 am: 9cec380720 am: cc6cd46d70
am: c009f2edcd

Change-Id: I97737f4c12285f0bbeed0bd2efdfec6fbe95fd03