Merge "Merge "[AWARE] Make PeerHandle comparable/hashable" am: 8d621cc042 am: bd82991016  -s ours am: 8b4960ec91  -s ours"