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

Change-Id: Id60706e623febcc35063ccb96c797fc4f9a223b1