[automerger skipped] Merge "Support putting one Ethernet interface in server mode." am: e7e38501e8 am: 88bc15c4bc am: 135240ae67 -s ours
am skip reason: Change-Id Id96d581acb3fa4e52ca62dd94ec257f56bd3a1ce with SHA-1 1d48d5e90d is in history
Change-Id: I3314b899730f367f154bd8b513094076084a6cef
This commit is contained in: