Merge "Merge "[AWARE] Make PeerHandle comparable/hashable" am: 8d621cc0 am: bd829910 -s ours am: 8b4960ec -s ours"