Merge "Switch DHCP server based on global setting" am: 846c80acf5 am: 85b40cb793
am: 87dfff626d

Change-Id: I3afe72583ccd17c5cc1f857b1292eaafc42df706