Merge "[AWARE] Make PeerHandle comparable/hashable"
am: 8d621cc042

Change-Id: I31a1ebcecd49b620462f2fb917e6c0c0d8f4d06e