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

Change-Id: Ie5d15cb95be4ef5e45a7070be8d5858176a94532