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

* commit 'f6d780a9e6d6574a1af3183bd5a9992e2784b534':

Change-Id: I00dab34ff58050039c51c70b45ac68c969cc4d92