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

Change-Id: I630886defc408edccc813ebc5a289f2df1185ab5