[automerger skipped] Merge "Assign specific client address to dhcp server"...

[automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90d am: d3aeeced am: ab9477a8 am: 19efa4f2 -s ours am: 4e642b22 -s ours

am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 86d212b4 is in history

Change-Id: I3180d4d4a2e78784dabececec066521ab73f6870