NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT...
NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE] am: aa36f071 -s ours
am: d08b5a11
* commit 'd08b5a11':
NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]