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

Change-Id: Ic53447dfd6cf026374f9fb9471db8d9d0563ae65