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

Change-Id: If36f772a171b4c909878509cefc466bd09ffc142