Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review [DO NOT MERGE] am: f02ae5e23c  -s ours"