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

Change-Id: I5442a9298822af5f6cbfa2570906bc38018c07e4