Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2 am: c4f797652c
am: ce80092aaf

Change-Id: Iec9e028d5c05d427cc3b1f81e97defb873b13d64