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