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

Change-Id: Ib32b679d1b5629422239407ab6a4ec5c8b67c1bd