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

Change-Id: I0d878f4ae7067e875879e683525d20338f2e3405