Merge "No need to explicitly list ethernet upstream type"