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

Change-Id: Icea0fa2a4a76a680016bdfd4516d8213ad68729f