Fix divergent equals and hashCode behavior
am: 27b250928c

* commit '27b250928cb3401d9a0a3a3f4b2026f1a431b6df':
  Fix divergent equals and hashCode behavior

Change-Id: I5a31d6166a0e1ed2d4f4c6cedb0afb5c831836f7