Merge "Add global setting to use new DHCPv4 server" am: 64dda3cf18
am: 0f78680ce2

Change-Id: I1be5693bc3d674b794d8afa763cb27eef2070ec9