Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
am: 9523a12b95  -s ours

Change-Id: I4b2f10eab109ef9e912fd0a6674fa3e7341b1e8d