Merge "No need to explicitly list ethernet upstream type" am: 01017959fe am: 065e3a7786
am: 0cde0ab951

Change-Id: Ide54094d327d67af32ca84c287d9cb09133390a0