[automerger skipped] Merge "Support putting one Ethernet interface in server mode." am: e7e38501e8 am: 4461cfb024 am: a6438c2a3a -s ours
am skip reason: Change-Id Id96d581acb3fa4e52ca62dd94ec257f56bd3a1ce with SHA-1 30a8f7ef23 is in history

Change-Id: I3314b899730f367f154bd8b513094076084a6cef