Merge "Migrate legacy dhcp server config to DeviceConfig"
am: 5212ff1bf3

Change-Id: Ie2ed6679fb723e1dd784c59be35f82d751562079