Merge changes from topic "parcelable_peer_handle"

* changes:
  [AWARE] Create a Parcelable version of PeerHandle
  Revert "[AWARE] Make PeerHandle parcelable"