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

Change-Id: I4a11cb67000324f9755c3cb6ab1d15dd6e23238b