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

Change-Id: I07e33a09f7ed2af457d2ad6261b5469b9dfd15c2