Merge "Fix divergent equals and hashCode behavior"
am: e8579b12a3

* commit 'e8579b12a3c5be5fef25fc5a1c8c2c9d43e49347':
  Fix divergent equals and hashCode behavior

Change-Id: I201238b2cb033e2b5f219896667c9438b5b7de05