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

am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

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