[automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours am: e600d2685b -s ours am: addf2cbafc -s ours

am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I0561f552a9b890995b8d5c987512292a9e7a1f75
tree: 8133cdd5a77f55fc6f1252122546d7c872273baa
  1. Tethering/