Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API...
Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460c am: bc74135d
am: b319bc2b
Change-Id: Ib0d578323b719b90d3330993d61079dc3885bf52