Merge "Assign specific client address to dhcp server" am: 037becbf64

Change-Id: Ic5b645bb62a1b62ab010a9fa50427e1a1fc8ff01