[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 -s ours am: e6b8de79 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 b6723a2b is in history
Change-Id: I687b35097132f4113a661be8cb80cefe2e637df7