am c89c3bee: am 2bd68b77: Merge "Fix infinite loop in GenerateIdentityHashCode"

* commit 'c89c3bee23898002f041ee30fec186e5c65d7381':
  Fix infinite loop in GenerateIdentityHashCode