Merge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev am: 407809c911
am: 78720f8a69  -s ours

Change-Id: Icbfd89f81e145670b67832be6505c2ec2eae7e6e