Merge "Fix divergent equals and hashCode behavior" am: c19deeb758
am: 953bc530a3

* commit '953bc530a3d16c5e73e95b0abacc56deb241996b':
  Fix divergent equals and hashCode behavior

Change-Id: I8e40f7cd8db56d007e1a7f61f1a0f52e56116922