NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]
am: aa36f07194  -s ours

* commit 'aa36f07194b29adee881e684b63f8bbdee6097bc':
  NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]