Merge "Fix divergent equals and hashCode behavior" into nyc-dev am: 2ff5780d90
am: 3600d1f06f

* commit '3600d1f06f8984b44035d9fe825fecfb3e527bf9':

Change-Id: I0347b2e64d4425fdead7c0e5545092ed9a068f22