[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 -s ours am: 82b73dee -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 86d212b4 is in history
Change-Id: I8f64dc247f35087304e80763c1dc61f38d0870ea