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

Change-Id: I933d282d021840b9b510b98b2af16cab1fed10d7