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

Change-Id: I93a74d80db134e832cef16d61abc057c88e86675